Fixed conflicts after rebasing master into combo-refactor branch.
authorTristan Van Berkom <tristan.van.berkom@gmail.com>
Thu, 30 Dec 2010 08:28:26 +0000 (17:28 +0900)
committerTristan Van Berkom <tristan.van.berkom@gmail.com>
Tue, 4 Jan 2011 14:37:14 +0000 (23:37 +0900)
commit4ff893979b7c99092910c2796f7701ece3914005
tree7cd3eeb01e203697298aebe5d4d22c78a30885fb
parentd681aa7977c7ee8144600f8b837d09720ef62f4b
Fixed conflicts after rebasing master into combo-refactor branch.
gtk/gtkcombobox.c
gtk/gtkmenuitem.c
gtk/gtktreemenu.c